Refactor to Settings design Bug: 275003276 Bug: 264483854 Change-Id: Ib886ace45db8cfd7dd0f468d03a0aa0551f1f5c4