Merge "Fix deprecation warnings in learning-switch"