Merge "Add max width to the screen instructions view text" into main