Merge "Resume when keyguard start going away"