Merge "dump method should accept --proto and --debug flag regardless of the order Bug:69006241" into ub-launcher3-master