Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev