Merge "Update Task surface position when bounds are changed"