Merge "fmem: reinitialize some qcache data upon returning to T-state" into msm-3.0