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

Change-Id: Ib3531e499059531a695f8c50642ecdea92d97c5f