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

Change-Id: Iaf32f0a0c5d72008240eb1588273f1dde7633148