References #2548: Fixed issues with concurrent clearing and setting of visual properties and visual property locks

(cherry picked from commit 56809c6907191e1ff5d8208bed420df189e98209)