Merge "Changed Toolkit shader effects to be a static function returning a Dali::Shade...