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

Change-Id: If80e9ace51c78ad7814e60a6dfa0a00454420091