Merge "Make aodIconTint default to white." into tm-qpr-dev