Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev