Merge "Simplify handling activity config a bit"