Merge "Fixes starting window being occluded when enable shell transition"