Merge "Make mCurrentPipTaskToken null when app crashes" into udc-qpr-dev