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

Change-Id: I2a2229d49b67f64e339ddfeefe293858df57f372