Replace the commit hook with a wrapper component based on display: contents

Replace the commit hook with a wrapper component based on display: contents #2036