Merge "Properly set the center of the circular mask." into cw-f-dev
am: 7aa48283b0

Change-Id: Ie54889ebded4a26ee20807f06d5832851eb941f0