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

Please define a variable for this expected result, so that we could avoid repeating this section.