Updated Defconfig
Fix Compiling errors by Last Merged Commits and revert gamma tweak