Merge "Fix IMS window visibility"