Merge "Add logic to show all status bar icons." into tm-dev