Merge "Revert "Revert "Remove deprecated System APIs added in Q.""" into qt-dev