Merge "Disallow long press below taskbar icons" into tm-dev