[automerger skipped] Merge "Fix issue that after reboot we might ask to select...

[automerger skipped] Merge "Fix issue that after reboot we might ask to select default data again." into qt-dev am: 8dee54e3 -s ours am: 26dbf31d -s ours
am: 138dfb8f -s ours
am skip reason: change_id Id204f3578b1c8a2a585789494915c7de0112c480 with SHA1 1bc557ba is in history

Change-Id: Ibcfa21070780fc64866493d4739b6fe71cd64321