Merge "Revert "Fixed the performance of unlocking when dozing"" into sc-v2-dev