Merge "Keep wallpaper on top when finish a non-fullscreen unoccluding window" into tm-dev