Merge "Dumping the excoded view hierarchy instead of the default activity dump" into ub-launcher3-edmonton