Merge "Properly set the center of the circular mask." into cw-f-dev