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

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