ButtonsFix

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