Improve check for activity on top after launch. am: a871a99ebc am: b7ff856a2a
am: b27e249370

Change-Id: I4c34f3356545d6d9a5a2f76838770c591347fb55