Merge "RESTRICT AUTOMERGE: Remove testLockTaskAfterReboot and remove testLockTaskAfterReboot_tryOpeningSettings" into sc-dev