Merge "Simplify width, height, transform variable for BSL" into sc-dev