Merge "SurfaceFlinger: Fix rect out-of-bounds checks"