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