Fix to floating memo issues in firefox.
Merge branch 'master' into prod