Merge "Restrict the area for the input to unsatsh the taskbar" into tm-dev