Merge "Change order of isVisible and setVisibility" into main