Merge "Draw legacy nav bar background directly" into qt-dev