Merge "PhoneStatusBar: Fix NPE when disabling navigation with no soft buttons."