Merge "Fix formatting of the dumpsys activity output" into sc-dev