Merge "DecorView#mNavigationGuard is gone"