Merge "Rename input aconfig module names to match conventions" into main