Merge "Fix LockSettingsService unit test flakiness" into qt-dev