Merge "Avoid clearing default browser setting when unnecessary" am: ef32746fc5 am: 3ee9594a27
am: 3c59e35788

Change-Id: Ifd4dcbc6f3ea6473ff212ad46bb8dc8197e3e35d