Merge "clear calling identity when changing volume"