Merge "Split status bar icon management into separate class"