Merge "DO NOT MERGE - Use focal point for scrolling in GestureDetector" into jb-dev