Merge "Handle multiple relayout calls with blast sync"