Merge "Fixing crash in FocusHelper and removing some old focus code for old Customize layout."