Merge "Draw legacy nav bar background directly" into qt-dev am: 324cdd4ae0
am: e335ed3ca4

Change-Id: I562101f6854550e983082494efacdb2fc5f42559