Merge "Use shell transitions to finalize cancel-to-desktop" into udc-qpr-dev