Merge "Make ChooserActivity grid items focusable"