Merge "DisplayImeController: reapply visibility when leash changes" into rvc-qpr-dev