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

Change-Id: I136c726a940bf0449539566bdda1c4e4c95817da