Merge "Let keyguard (un)occlude animation run even when no activity exists." into sc-dev