Merge "Set input layers to GONE rather than INVISIBLE." into main