Merge "Represent action as text in dumpsys" into pi-dev