Fix situation where callout can be obstructed

- Callout can be obstructed by previous controls because how last
control gets re-added as subview changes the subview ordering.