Fix for incoming call UI layout

Also has tweaked strings for phone settings

Change-Id: Id2ef74ced967faa2482c0de28e7ac891288e8ba2