Merge "CDD: Add requirement for application overlay window type" into oc-dev