Merge "SurfaceFlinger: fix a crash with RefreshRateOverlay"