Merge "Account for hairlines in quick rejection logic" into jb-mr2-dev