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

Change-Id: I0f0e7d7ed162ea5d54d4bd7f895109ac51c10f30