Merge "Make the checkbox item large enough to click." into tm-dev