Merge "Add proto for USB default screen"