Fix app forceclose issue

Change-Id: Ifb13945e249417ae035a3c2137a0ddd4dc717b94
Merge branch 'cm-12.0' of git://github.com/wulsic/android_device_samsung_nevispcm11 into cm-12.0