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

Change-Id: I3291e2788df951510c5abf3a23df226d5174a5c5