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

Change-Id: I02254bd81a254f76014f3f2240fc6ecb1400a0e4