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