Merge "Improve Toast usage" into qt-r1-dev
am: c9f2f6c0ba

Change-Id: Ifcd1153b5f0f7dc72fac4f78432460e68ef65c09