Simplify checking for source + display upgrading when uprading or reinstalling