Merge "Adding tests for dual tone shade in ScrimController" into sc-dev