Merge "Fixing dual tone shade in split shade mode" into sc-dev