Merge "Add visibility for the user during app restoring" into main