Merge "Add separate roaming icon for status bar + QS"