DO NOT MERGE:Improve check for activity on top after launch. am: 9d8c5ba97e  -s ours am: 6f82325df0
am: 4e638de3f1

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