Merge "Fixed a bug where the icons where clipped off with owner info" into qt-r1-dev
am: c1b4a300d5

Change-Id: I148b52730205473a6e4a1a4fd9d5cebf04f80539