Merge "Update dialpad screen design"