Merge "Fixes De data is not backed up correctly when user locked (1/n)"