Merge "Make dimens in StatusBarIconView resources" into qt-dev