Merge "Proxy search disabled flag to Launcher" into qt-r1-dev
am: 6d4d529fb1

Change-Id: I2250c7f1e66537516959295a745a326562251458