Merge "Animation on fold for fold lock behavior setting" into main