Merge "Revert "Force client composition if we'd use rotator"" into pi-dev
am: 88ec27588b

Change-Id: I9f8a8bd156f4a008c8db40faef6625e66363d64f