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

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