Merge "Change UI to be consistency with dialer settings light M2 theme"