Merge "Skip snapshot task when finishing activity for shell transition" into udc-dev