Merge "Redraw legacy navigation bar paint onLayout" into qt-qpr1-dev
am: 10000738e4

Change-Id: I153b1ec594dff63eb13fc386c38820404c095fd4