Merge "Added hidden API for specifying launch stack in ActivityOptions"