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

Change-Id: I53416f40212ed06e890b3031dfa54184d6938178