Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev