Merge "Revert "Fix DecorView error about non-visual context"" into rvc-dev