Add some additional checks to prevent effect elements from getting into bad time state. Part of VIX-318.
Merge branch 'master' into EditorRevamp
Fix effect element border drawing.