Merge "Invert the sense of the two-figner direction on tablets." into jb-dev