The problem is that we were calling done() on the EntityHeaderController and passing false for whether to rebind the action buttons, which means we were getting the default behavior including a visible gear icon. Passing true to request rebinding causes that icon to be hidden. Bug: 63405635 Test: make RunSettingsRoboTests Change-Id: I031f4a2d176ff3be025cc2675d7026a679936b03