Merge "Revert "Camera:Retain dumpsys logs from previous open session."" into sc-dev