Merge branch 'sk/status-short-branch-color-config'