Merge "Dual tone shade implementation" into sc-dev