Merge "Fix NPE for devices w/out soft-nav." into klp-dev