Merge "Only show OPEN button as needed." into nyc-dev