Merge "Touch explorer and magnifier do not work well together." into jb-mr1-dev