Merge "Revert "Fixes cannot leave dozing when dismiss keyguard"" into sc-v2-dev