Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev