🐞 fix: layout dir fix(cherry picked from commit cf942d0be9b3d404189157adfa14f7da4cf567fe)