Merge "Removing focusability from all scrims in shade" into main