Merge "Test remove/re-add get same staggered layout" into lmp-mr1-ub-dev