Merge "Fix a bug where image apps were double-counted." into oc-mr1-dev