Merge "Make LockTaskController default behaviour match ScreenPinningSettings." into qt-dev am: 14017c42 am: eabc7337 Change-Id: Ia68de988676a5afb82ab9217313a7d76adfd3bdc