Merge "Combine screen on time map into battery usage map" into udc-dev