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

Change-Id: Ib055e8363c3fc4432b75ba6e46747b68dd698123