Fixes #183: Scrollbar not shown on Camera Gimbal Setup View
Re-fix setting Advanced Mode flag after refactor
Merge remote-tracking branch 'upstream/master' into mac64