Merge "Update theme of ActivityPicker"