Merge "Fix status bar flickering" into qt-qpr1-dev
am: 89ebc7c1ad

Change-Id: I0fb3b62248e139ca30f3981588278c04b3471dd5