Merge "Use UiContext with StrictMode Dialog" into oc-dev