am cb2cf8aa: am b371444b: am 16ad5748: Merge "Fix caption settings picker layouts" into klp-dev

* commit 'cb2cf8aa4375fc6ba0abf9abffeafebeeb0964e1':
  Fix caption settings picker layouts