bordercontainer was replaced with group


Change-Id: I8c530c9f08416f9d950502cdbb6b14cfc81f6c8c
alignment-control image was made visible 


Change-Id: Icfc52b956f6550dff5f483932f5bae5cf5c88a23