Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev