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

Change-Id: I649a44fc4ec8e299af76e1fef5974f18edd54979