Merge "Make sure that Toast is always shown by Meta-Space." into nyc-dev
am: cd1e1de

* commit 'cd1e1de4cebbb8257e9ab827ab3727c7c4fe1cae':
  Make sure that Toast is always shown by Meta-Space.

Change-Id: I401a3871d92c379d653a67c12b09c34647e2ed11