Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev