Merge "Speculative fix for exception in CoordinatorLayout.onLayout" into nyc-support-24.1-dev