Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev