Merge "Improve `dumpsys backup`" into main