Merge "Move retention length of users' chooser selections to SystemProperties, to meet CDD requirement."