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

Change-Id: I61d2d40eb473022222ca1e6aff4c5a2487dec29f