Merge "Add support to enter sideload mode directly"