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

Change-Id: I7eadfb255527a0f1ed24df8725d8cc67bdb6152f