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

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