am 6de0ee41: am 8d6730fd: am b89e969c: Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev

* commit '6de0ee41f9a9668180368d82da688793cef9489d':
  Fix font scaling issues in FastScroller and SubtitleView