Merge "Revert^2 "AppStartInfo surfaceflinger and renderthread timestamps"" into main