Merge "Checks keyguard earlier when blocking notifications." into pi-dev