Merge "Fix issue where window would be marked as opaque" into sc-dev