Merge "Simplify parameters of ensureActivityConfiguration" into main