Merge "Handle rotation gracefully in the backup/restore confirmation UI"