Merge "SF: Refactor HWComposer::onHotplug()" into rvc-dev