Merge "Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""" into mnc-dev