merge from master

unfreeze mapcanvas when atlas previewx is ON
and disable label filtering if mask layer has no object