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

Change-Id: I2f50ee1a68da4501e29bca9848d60abce11ea7e7