Merge "Fix activities cannot be resumed when non-secure keyguard shown"