Merge "Separating logging for Apexd triggered rollback" into main