Merge "Avoid activity restart by config changes while test"