Merge "Changing initial and default focus behavior"