Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  SideBySide2: Correct placement of column margin bar

Change-Id: I48d58e0b4ff031091b7b06226346db5a545c9e15