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

Change-Id: I6a0046907be31be0156e8eb62c0c0fd96ea27810
tree: 4113578b9f60cc19a4a689482ba43a72ff80600d
  1. tests/