Refactor in support for Gingerbread as the external activity
Another mass conversion to shared instances for controllers