Merge "Sync activity picker to latest dialog style." into honeycomb