Merge "Merge "Always use light reveal scrim" into sc-qpr1-dev am: d31ee841 am: 845fed6a" into sc-v2-dev-plus-aosp