Merge "sdm: Add support for inline rotator"