Merge "Polished Scoped Directory Access UI." into nyc-dev