Merge "Clean up navbar for autohide" into rvc-dev am: 00af622cc3

Change-Id: I7135d46708b7b3acf8254eb59a067b28b4b82272