Merge "Update work notifivation settings on upgrade." into pi-dev