Merge "Address comments from API review." into qt-dev