Merge "Fail more gracefully when window state changes during drags" into honeycomb