Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev