Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev