Merge fix for SL-46373 / VWR-1369 / Intermittent Crash on Edit from Pie Menu

NOTE: Only a partial merge from maintenance!!!!
svn merge -r 64309:64310 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release