Merge "Respect child drawing order when dispatching touch events" into jb-mr1-dev