Merge in I9505G sources: Some more defconfig items