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