Merge "Force app to draw navigation bar background" into qt-dev am: 0454f3b8ae
am: e07de8fc65

Change-Id: I8a195157a0b98217a5b710ad38c99cb56ee8f65f