Fix issues when active layer change is emitted before the layer is pa…

Fix issues when active layer change is emitted before the layer is pa… #644