am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and...
am 106f88c8: Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev
* commit '106f88c8':
Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""