Merge "Fix surface flinger property types"