Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev