Merge "Fix NPE when invoking Context#isUiContext" into rvc-dev