Merge "Cleanup UserManagerCompatVP to not use reflection" into ub-launcher3-edmonton