Merge "Do not run peek animation when keyguard is fading" into pi-dev