upstream: make layouts switch with current upstream master