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

Change-Id: I8c18041e293f260695bdca4e62c8587df9c50491