Merge "Add vertical layout flag to Paint class" into main