Merge "Make disabled items look disabled." into nyc-dev