Merge "Reset update spec after canceled layout"