Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev