Merge "Revert "Have backup TouchController of Taskbar All Apps AFV."" into main