automerge: 2381825 * commit '2381825db49718891e345eebe34b58644beab10d': Do not go through a layout if visibility is GONE