Merge "Apilint updates" into qt-dev