Merge "Replace snapshot starting windows w/ splashscreen"