am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev

* commit '106f88c890bd128ef89aa4f0dee591c2ad38fa6b':
  Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""