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

Change-Id: I6b4d24fe6e18250ff2e3f9bd5448116581d2d5f9