Merge "Remove embedded_activity_back_nav_flag" into main