Merge "Start unfold Shell transition from WM side only when unfolding" into udc-dev