Merge "Snap for 5353420 from f094924d2540421b8a578359d104e16388821150 to androidx-navigation-release" into androidx-navigation-release