Removed redundant code and fixed toxav codec actions being called when call inactive
Forgot to uncomment test builds
Resolved conflicts when merging upstream
Merge branch 'mannol1-master'