Merge "Remove options menu from BatteryUsage to align material next" into sc-dev