Merge "Fix the multi-user keyguard dialog animation" into tm-dev