Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev