Merge "Fixed issue with not finding existing activity for background user" into mnc-dev