Merge "iommu/arm-smmu: Keep track of S2CR state" into msm-4.8