Merge "Don't use WRAP_CONTENTS in testZoom." into klp-dev