Merge "Merge cherrypicks of ['android-review.googlesource.com/2918225', 'android-review.googlesource.com/2933030'] into androidx-compose-release." into androidx-compose-release