UI work for assign activity multiple, refs #6584
Merge branch 'dev' into test