Merge "Add separate roaming icon for status bar + QS" into nyc-mr2-dev