Merge "Fix spacing issue for dark_mode_section" into tm-qpr-dev