baselayout: Update for Evolve OS changes