Merge "Revert "Add wallpaper input consumer to WindowManagerService"" into nyc-dev