Merge "Clean up null check for mBackNavigationController"