Merge "Annotate ChargingStatus as a state atom." into rvc-dev