Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev
am: 039dcadc88

Change-Id: Id1b9f4a540a39046b365fbbf10431b86f6af63f1