am 6e51a707: am 378510c3: am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev

* commit '6e51a707ea986102fb507bfdf00d2a4dddee70f7':
  Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""