Merge "Fix mobile radio battery consumption double counting" into sc-v2-dev