Merge "Preventing activity restoart on mnc/mcc changes" into ub-launcher3-edmonton