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

Change-Id: I81b40448821fa478355d048e566e3432a5d3bef9