Merge "Add strings used for setupwizard lockscreen skip dialog" into qt-dev