Merge "Add trunk stable flag for embedded activity back navigation" into main