Merge "Update adb backup/restore confirmation activity on new intent"