Merge "Fix integer overflow in make_timestamp_ns_locked" into qt-qpr1-dev