Fixes another group layer update problem. Also freeze/thaw notify emissions around the whole function.