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

Change-Id: I815f86cf6a1c9a14f9ed369c9f939c3c1b98cd09