Merge "SurfaceFlinger: mExpectedPresentTime should not be updated outside the main thread" into sc-dev