Merge "disable zoom buttons on m-touch screen only"