Merge "SurfaceFlinger: prevent division by 0 in Layer::fillInputInfo"