Merge "Misc change to support loading dynamic summary/icon in app"