Merge "Do not place elements if they are not going to be drawn anyways" into main