Merge changes Ic00e9b8f,I59cf13ae

* changes:
  Ignore two tests that sporadically fail due to DynamicAnimation quirks.
  Ensure the cutout is not null before trying to use it.