Merge "Fix wrong dumpsys header for activity containers"