Merge "Update the default backup user after onUserUnlocking if necessary"