Merge "Fix AlertDialog item direction" into mnc-ub-dev