Merge "AlertDialog + Dialog fixes & improvements" into mnc-ub-dev