Merge "Fixes dumpsys activity --list-dumpables" into tm-dev