Merge "Scrims should be grey when in-app"