Merge "Add checkable two target preference layout"