Merge "Hide 'set default' checkbox if it's not going to be looked at next time anyway." into cm-10.2