Merge "Correct ordering of status bar panel layers."