Merge "Fix pop-up shadow drawn in the wrong place with Skia pipeline" into oc-dev