sync with mobilelayout branch of coUclient