Merge "Prefer defining local variables over userData.mBindingController" into main