Merge "Fix z-order issue with text cursors and PiP." into oc-dr1-dev