Merge "Fix truncated text in inline settings" into oc-mr1-dev
am: 406042a5be

Change-Id: I2cb6066760c26103896720e47b6758901f3a637b