Merge "Create input consumer only when nav bar is hidden by client" into rvc-dev am: 0bd7672693 am: 000e5cb003 am: 1c4e921a6a

Change-Id: I70da939d21ad7b668531890fbb99a834b2e95fe4