Merge "Fixing issue with the lock-to-app setting not being refreshed when entering recents." into lmp-dev