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

Change-Id: Ib7e7fd4f8408f739b46506bcc4b715c87f3a8bb1