Merge "Reduce layer assignment and placement for intermediate state"