Merge "Fix NPE for devices with hardware navigation."