Re-arrange field positions on activity detail.
#MBL-10732
Merge remote-tracking branch 'origin/develop' into develop