Merge "Only rely on ActivityConfigurationChangeItem to update activity config"