Merge "Fix typo in TestActivity action name" into pi-dev