* commit 'c772b60a94a2b3cb024be01bafd3a35b702f8eb1': Fix deadlock window manager and device policy manager.