Merge "Tweak the string for battery saving" into rvc-dev