Merge "Don't assume r.curApp is valid when finalizing broadcasts" into rvc-dev