Merge "Finish unfold Shell transition if animation has finished already" into udc-qpr-dev