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