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

Change-Id: Idd92c09be8a7e14d2a09099979abdcdd64419d8f