Merge "Revert "Changing initial and default focus behavior""