Merge "libgui: reset mEnableFrameTimestamps when Surface disconnects"