Squashing commits for disabling zoom buttons feature