Merge "Fix preference screen title to make folded devices the same as phone" into tm-qpr-dev