Merge "Do not set side stage position" into udc-dev