Merge "Merge "Bump special windows layer adjustment" into oc-mr1-dev am: f3f7a101fb" into oc-mr1-dev-plus-aosp