Merge "Excessive battery usage fix." into rvc-qpr-dev