Merge "Fix stashed PiP so it only moves up/down if outside of insets" into udc-dev