Merge "Ignore testFactoryReset in instant app mode"