Merge "Make mirror window accessible (2/2)"