Clean up multi picker activity.

Change-Id: Id8d66cf3ff5f806a053f40bd4d8db453ab292219
Merge "Clean up multi picker activity." into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD