Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev