Merge "Don't show UNLOCK button when there are no users." into nyc-dev