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

Change-Id: I1805d33f31dc73a266f13a956c67549ef39ec2a6