Merge "Adds TransactionManager dumpsys info and cleanups" into main