Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev