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

Change-Id: If171608fd6b00b1f2a8dc4b0a864543816f5abc8