Merge "Enable Spy Window Gesture Monitors"