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

Change-Id: I680097d99903a8e3b608ab02798edda0f0ecc56e