Merge "Rename of DoodleEffect as part of cleanup (Bug 5287103)."