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

Change-Id: I9838554db314d97c66ddd4fb1fc739c5109e4cc6