Merge "DialogAlert window changes for Micro" into klp-modular-dev