Bug 1015643 - Unify layout activation to updateCurrentLayout() and use LayoutManger & Loader +shepherd

the same typo here. Can we remove this redundant comment?