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

Change-Id: Ifea5eec9aebf553b4b092835fd306176d532ecbe