Merge "Fixes StaticSharedLib state issues" into rvc-dev