Merge "Block relayout during transition to desktop" into udc-dev