Merge branch 'scalar_bar_font_scale-rel' into release

Change-Id: If84aee62312408127e153bd55e9cc65785f1eac5
Merge branch 'release'

Change-Id: I28148a961c10a676bcb55597ea592eb61dff0ede