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

* commit 'b371444b2fee94045ea97c7f4e97a08610595d61':
  Fix caption settings picker layouts