Merge "Make LockTaskController default behaviour match ScreenPinningSettings." into qt-dev
am: 14017c42b1

Change-Id: I587519c59bfd284a6ae18ab78db283ff01d644d9