Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev