am 1aaf7d6c: am aecf9ba8: am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev

* commit '1aaf7d6cb9e88876879a7b8fbfc51c2c97bca82d':
  Fixed issue with not finding existing activity for background user