am bd3f8a2e: Merge "Swap default avatar"

* commit 'bd3f8a2e38ab46b33fa8afc6c4d8d613db9a6b2a':
  Swap default avatar