Merge "Add comment to AndroidManifest" into qt-dev