Merge "Perform userdata backup for all matching rollbacks" into qt-dev