Merge "Merge "DO NOT MERGE Fix migration for default browser." into qt-r1-dev am: 85773ee5 am: 09a909b0" into qt-qpr1-dev-plus-aosp