Fixed issue where masked groups get simplified, affecting the masks transform
Fixed performance issue - Deselection of shapes workaround was being over-used