Merge "Fix dumpsys formatting for mIsOffBody" into main