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

Change-Id: Idbc6646e85044304cc87aa4d67b807b8b2e169d2