Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev