Fix camera rebind

Change-Id: Ib136011ba6d2cac92ba529e78fa3b242534f3bbd