fix non instrusive incallui layout

Change-Id: I733dc212d1a4cbe68acb96881e5befd312610e0a
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/layout/card_call_incoming.xml
Clean up commit

Change-Id: Id3cd3acdc0ee4fab3f3bee0677eddf6779a5455c