Merge "Preventing activity from rotating while the user is dragging an item. (Bug 6240922)" into jb-dev