Merge "DO NOT MERGE Fix migration for default browser." into qt-r1-dev
am: 85773ee58c

Change-Id: Id77d665cc2257f5884ca1f839c2d44aeee0cbb1d