Merge "Change to using sysprop for libgui_tests" into rvc-dev