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

Change-Id: I3d9ac324c7ade67f69b750b126864dcbd7f8280a