Merge "Copy lockscreen notification settings upon upgrade" into nyc-dev