[AMOS commit] MDL-34534 Backport activity chooser default setting to 2.3 stable Committed into Git: 2012-07-06 14:14 UTC