Fix re-assignment of hw keys after disable/enable navbar

Change-Id: I85eb4617930b932fcefb3077fc2bcbd511b9ac81