Merge "SpecialPageExecutor, make sure Skin context is correctly set"