Merge "Revert "Unify context in ViewRoot"" into qt-dev