Merge "Removed dividers from Phone Settings (2/2) redo" into tm-dev