Merge "Ignoring display size change when display is off" into sc-v2-dev