[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 am: c13637ba -s ours
am: 5798fc54 -s ours
am skip reason: change_id Id204f3578b1c8a2a585789494915c7de0112c480 with SHA1 1bc557ba is in history

Change-Id: If212dc3802b34fd66c71e3caa5dc964472553417