Merge "Fix the scrollbar of the SaveUi is outside the screen"