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

Change-Id: I9c306e97dfe3fad6b710f5e5323be9bf775bc157