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

Change-Id: I278979af13c128a84736d34c1d5287055ef265e1