Merge "Only bring side to top when split visible" into udc-dev