Merge "Final (?!?!?!) improvements on Activity.dump()"