Merge "Make LockTaskController default behaviour match ScreenPinningSettings." into qt-dev