Merge "[WK2] Revert patch / set a limit of layer count and atlas size." into 2.0_beta