Merge "Split ORIGIN_USER into "user from systemui" and "user from app"" into main