Merge "Fix AlertDialog.setIcon() not working when called after show()" into mnc-ub-dev