Fix thumbnail showing issue;
Fix thumbnail snapshot with edit menu issue,