Merge "Merge "Block relayout during transition to desktop" into udc-dev am: 3be325fb64 am: 7f86641c7e" into udc-d1-dev-plus-aosp