Merge "Fix DecorView error about non-visual context" into rvc-dev am: 8927986f am: 64b0a51b am: 776ff41d Change-Id: I3c26f5ed330fa2d37823d3646e0e94502b143881