Merge "Unify context in ViewRoot" into qt-dev
am: 2569d579a4

Change-Id: I0e459f6b8e94489dc0e2f133d6c9df2382ebffe2