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