Merge "Focus and Close over Contoller instead of View" into main