Merge "Convert view binders to classes" into 24D1-dev