Merge "Add popUpCurrent to navController"