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

Change-Id: I441284c9b8dca04d5526edd9bbbae779322b9dea