Merge "Add a new launch type for hot start with relaunched activity"