Merge "Change IME picker dialog from Activity to Broadcast"