Merge "Revert "Extract camera launch code from NPVC into CentralSurfaces"" into tm-qpr-dev