Merge "UserProperties is @SystemApi & migrate 2 old props"