[mr3101] Use membar in most locked singletons. Part 1. Based on testing commit 5b5a87d6f124d4579aac63846ecb6b11cbd29416