Merge "Revert "Disable HostComposition for now""