changes to the way camera widget toggle is handled

Change-Id: Id6428fd2a48702d67b8f954a2b4533df70985fe7