Merge "Revert "SurfaceFlinger: debug layer bounds inset""