Merge "sde: resource config: rotator downscaling and z_order setting"