Merge "SF: use 'base::GetBoolProperty'" into main