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

Change-Id: I9955d17200e9af9cc29794a771469f14eab8c6c4