Merge "Rename surfaceflinger properties' contexts"