Merge changes I9414c0b2,I649b9198 into tm-qpr-dev

* changes:
  [SB Refactor] Implement demo mode for carrier merged wifi.
  [SB Refactor] Display carrier merged wifi networks as mobile.