am 7c04ca66: am 96af21df: am 86bb7f0a: Merge "Fixing issue with the lock-to-app setting not being refreshed when entering recents." into lmp-dev

* commit '7c04ca66712edf78024156c452287fccefde8479':
  Fixing issue with the lock-to-app setting not being refreshed when entering recents.