Merge "Validate that the system ui proxy calls are from current user"