Merge " Replace setFinalCrop with temporary layer"