Merge "Fix FloatingActionButton auto offset functionality" into nyc-support-24.1-dev