DO NOT MERGE:Improve check for activity on top after launch. am: 9d8c5ba97e  -s ours am: 6f82325df0 am: 3b8a14323c am: b0fc0ec688
am: 82ee1ae3a5

Change-Id: I3a64f6f5f2c41315be36e684e9e7964302bae8c2
tree: 9eeb83d166b69345adc7b90693edb69ec526c270
  1. tests/