Merge "Do not translate statusbar icons" into qt-dev am: 47e4102e9f
am: 5c2b1ce4d3

Change-Id: I064d86f4e784c3c0cc61679b9c41254edc6661b1