Merge "bug 433 NPE in onGlobalContextUpdated of ControllerContext class"