Revert "Revert "Fix missing mNavigationBarLeftInLandscape""

This reverts commit e61e3cb7ba7130938451ef9ae63f10f071aee940.