Merge "Fix pop-up shadow drawn in the wrong place with Skia pipeline" into oc-dev am: a5c6ba3473
am: 563c5d3643

Change-Id: I8a24e8d642d49cb4822db50bbf3b2fe6e5ec9122