Merge "Bump special windows layer adjustment" into oc-mr1-dev