Merge "[DO NOT MERGE] Revert "Fixed the performance of unlocking when dozing"" into sc-qpr1-dev