Merge "Expand scrim all the way to the right" into mnc-dev