Merge "Use app info to load app data instead of component info" into udc-dev