Merge "Fix shadow showing up over dialogs" into mnc-ub-dev