Merge "Request focus when we set enabled true" into main