Merge "hwc: Add rotator obj to layer-rot-map if acquired"