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

* commit '132f77f0f13597e88161d6a290dc0bdf237b0234':