Merge "Prevent wallpaper flicker while entering split screen from overview" into tm-dev