Merge "Check custom component names before aggregating BatteryUsageStats snapshots" into sc-qpr1-dev