Merge "Redraw legacy navigation bar paint onLayout"