Merge "UI fixes for system bars"