Merge "Add checks against incorrect context use in sysui tests" into oc-dev