Merge "Add extra resources field for ApplicationInfo"