am 50d4de21: Merge "Fix bug with display lists and layout." into honeycomb

* commit '50d4de21ee6a2ee62c7ad89dfdfd82d1045e7a58':
  Fix bug with display lists and layout.