Merge "Revert "Delay coming out of doze until keyguard dismissed""