Merge "Fix CoordinatorLayout scrim functionality" into nyc-support-24.1-dev