Merge "Update atoms with the final API constants" into qt-dev