Merge "Add metrics constants for accessibility edit dialog"