LPS-33282 Different conditions for updating and sorting layouts