Merge "Only show dialog if top app is killed" into oc-mr1-dev