Merge "Revert "Unify context in ViewRoot"" into qt-dev
am: 5a2e6040c2

Change-Id: Icc3281cab710b0dfa615a6d7abcafac62cd0466b