Merge "Fix cropping by allowing layerType to be reset regardless of height." into sc-dev