Merge "Fix NPE during dumpsys" into qt-dev