Merge "Move res-common files to res where destination file doesn't exist" into ub-contactsdialer-g-dev