Merge "Mark UI components for tests to find." into nyc-dev