Merge "Fixing shade not collapsing after rotating from split shade" into udc-dev