Merge changes from topic "launcher-mnc-mcc" into ub-launcher3-master

* changes:
  [automerger] Preventing activity restoart on mnc/mcc changes am: f5c5d04b3b
  Preventing activity restoart on mnc/mcc changes