Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev