Merge "Fix InsetsSourceConsumerTest.testRestore()"