Merge "Use opaque window as reference to show snapshot starting window"