am ae4ffb11: Merge "Display non-square bitmaps as circles"

* commit 'ae4ffb11ac3b3d45c893d8fa6f182d9a28846836':
  Display non-square bitmaps as circles
tree: bf7852eb179af719eaf928729dee743333699755
  1. src/
  2. TestCommon/
  3. tests/