Merge "Revert "Enable new initial-focus behavior for P""