Merge "Revert "msm: kgsl: Temporarily turn off NAP for 8960 stability"" into msm-3.0