Merge "Add null check in IMS hideWindow" into rvc-dev