Fix placement of device validation files, change session checking logic

Fix placement of device validation files, change session checking logic #10230