Bug 913362: fix activity choice regression