Merge "Update toast UI" into oc-dr1-dev
am: 436b1e2f0e

Change-Id: Ia346c80194c8792e51be927cc19e4555d3c1527f