Merge "Fix touchable area after shade is gone in Flexiglass" into main