Merge "Resolve cross-user image exploit for conference status hints" into main