Merge "Update IMMI#removeImeSurface() to take display ID" into main