Merge "Fix intent launch flag"