Fix app force close issue

Change-Id: I6df62854f2fa01842b3c767857061842a2a4eae6
Merge branch 'Testing' of https://github.com/wulsic/android_device_samsung_nevispcm11 into Testing