Merge "Migrate lockscreen.disabled on upgrade"