Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into qt-dev