Merge "Restrict access to dangerous methods to <= P" into qt-dev