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

* commit '378510c3aecf958871e4d9b35b9bb5e80f5e9ea2':
  Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""