Was William Whitelaw deputy leader of the conservative party before or after the formation of the second shadow cabinet of edward heath?