Merge "Fix boolean logic in SurfaceFlinger property read"