Merge "sde: resource config: rectangle alignment for video and rotator"