Merge "Fix FloatingActionButtonTest build" into nyc-support-24.1-dev