Merge "Remove EXTRA_KEY_TYPE intent data"