Merge "Fix NPE during dumpsys" into tm-dev