am b36d9a5a: am dd3a3d9c: Merge "Fixing AllAppsCustomize Keyboard Accessibility / NPE (issue 5483485)" into ics-mr0

* commit 'b36d9a5a667366b852f2b7be6ab0f15b3add1907':
  Fixing AllAppsCustomize Keyboard Accessibility / NPE (issue 5483485)