Fix app settings layout

Change-Id: I72655fc9f82a55a86956d56489d1fd9176df9b82