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

Change-Id: I571f43c78c8e6cbba19356563b780bd598131456