Fixes spacing on all devices (DT-1314)
Merge remote-tracking branch 'upstream/develop' into develop