Merge "Show charging status in addition to trust granted" into rvc-dev