Merge "[DO NOT MERGE] Update TestSidecarWindowLayoutInfo to handle Sidecar"