Merge "Check if singleLineTitle attribute is set for the preference." into oc-dev
am: a86e3d70e3

Change-Id: I68121fbe007d659fb3a4b9930b8457d1289724a1