Merge "Destroy dimLayer surface in removeDimLayerUser() if it is not fullscreen."