Move data restore to onActivityCreated