Merge "Add plugin to list before sending PLUGIN_CONNECTED am: 440e6fae5e" into qt-dev-plus-aosp