Merge "Add missing null check for mBatteryPercentView." into sc-dev