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

Change-Id: I233c1302fd7f86854255e64c06ef5c5130f77a29