Merge "Only show dialog if top app is killed" into oc-mr1-dev
am: 4018898ae4

Change-Id: I01bb75704d262cccce0f97aeb13de2ba02ace2f0