Merge "Fix caption settings picker layouts" into klp-dev