KF5: Get in sync with upstream