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