Merge "Clean up long launched flag and obsolete aconfig" into main