Merge "Fix issue with unresolved IDs in adaptive icons" into oc-dev