Merge "Change FIRST_LOAD_AFTER_RESTORE_KEY to be nonRestorableItem" into main