Merge "Merge "Fix leak in ScrimView" into oc-dr1-dev am: 20b9b73e80" into oc-dr1-dev-plus-aosp