Merge "Update launcher_trace.proto for quick switch" into ub-launcher3-master