Revert "Fixes for device specific dock support"

This reverts commit 43b80df7aea2fa6fa973ca3c5d639ee3f5582fd1.

Conflicts:
	core/res/res/values/config.xml

Change-Id: I84c11f397cafdaac78565c98651bc59ad5ccc794