Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev