Merge "Improve dump: type & touchOcclusionMode"