Merge "Fix checkbox touch target to be at least 48dp" into nyc-dev