Merge "Set visibility on class properties of UnregisteredLocalFile"