Merge "Don't change resize mode if AM didn't dock the task as requested" into nyc-dev