Merge "Fixes NON_BROWSER flag behavior" into rvc-dev