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

Change-Id: I5f00d7989b2849c89710e8f24ec8bc33837913f6