Merge "New preference for multi-selection check boxes." into jb-dev