am 8db8bc63: Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev

* commit '8db8bc63624bbd1d803e02571fa865f1f7fa584c':
  Skip drawing empty shapes to keep Apple JRE happy.