Merge "Fix Dialogs inheriting bad window flags" into mnc-ub-dev