Merge "Merge cherrypicks of [1000266, 1000081] into androidx-transition-release" into androidx-transition-release