Merge "Expand dumpsys coverage to all known factors in empty expanded view issues." into rvc-dev