Merge "Fix issue that after reboot we might ask to select default data again."