Merge "Adding some activity state information in dump" into ub-launcher3-edmonton