am 5d6930fe: (-s ours) am c70629f1: am 583ed765: Merge "Take shadow bounds into account for quick rejects Bug #8634346" into klp-dev

* commit '5d6930fe4ea0c24f6e1fde4a250cfb941311ed7b':