Merge "Use correct WindowManager for Toast." into jb-mr1-dev