Merge "Beautifies picker disabled dialogs (1/2)." into tm-qpr-dev