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

Change-Id: Ic20adda2400c2439baf5d277de003ec0f2322afe