Merge "Ensure destinations are linked properly on nav back stack" into androidx-master-dev