Merge "Bug 575256 [ui] Change diagram titles for better usability"