Merge "msm8960: Reduce scratch size to 300MB"