Merge "Do not sleep activities in focused stack when keyguard is going away" into pi-dev