Improve scrim handling

Bug: 15163546
Change-Id: I0d2c05b035f832f4b4e6a2fc34113fe9d5677525
10 files changed