Merge "Fix re-layout race condition"