Merge "Update Computer dialog UI" into tm-dev