Merge "Clean up/fix some minor focus-related code."