Toggle shade Ex

Change-Id: I408f754fb658c5d3b9b71a61569112a62953fe92