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

Change-Id: I3d85bdd17c8b876e900e70bb7712a4473e6a4b07