Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev
am: 4f199459
* commit '4f199459':
Unified work lock checkbox should roll back when user cancels confirm dialog
Change-Id: Ie83daa2b232ddd6a7f733ddb8b9f0f733d62bccb