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

Change-Id: I9487f1c946fcce65c6ab3741e47ea0c66719a567