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

* commit '24ca6320b88afabd854fae176988be02bb6d92aa':
  Skip drawing empty shapes to keep Apple JRE happy.