Merge "Changes to handle VR state transition in power HAL"