Merge "Properly handle pending intent for multi-user" into tm-dev