Merge "Fix flash when switching from app window to snapshot." into ub-launcher3-master