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

Change-Id: I0dd3a57d7f2e87074f1bd5275c011116dcba1d9d