Re: [master] [PATCH] Do not remove the layout if it was added back (#865830)