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

* commit 'b861bf305c3434436990035a88ea850e646fc40b':
  Rename of DoodleEffect as part of cleanup (Bug 5287103).