Merge changes Id53733ac,I38e917cf into tm-qpr-dev

* changes:
  [Sb refactor] Move subIdFlow into its own repository
  [Status bar refactor] Implement the lookup from network type to RAT icon