Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev