Merge "Remove rollback confirmation user preference"