Merge "DisplayArea: Fix computation of ImeContainers parent surface" into rvc-dev