Merge "Change PickActivity's icon to the app's icon." into arc-apps