Merge "Update tests and canvas subclasses to expect drawImageRect calls" into main