Merge "Optimization: reducing number of getNavigationModeMismatchError calls" into ub-launcher3-rvc-dev