Improving the Optical Quality of MoSe2 and WS2 Monolayers with Complete h-BN Encapsulation by High-Temperature Annealing