Merge "Fix overlapping status bar icons."