Merge "Merge "Refactor ToastPresenter to perform show()/hide()" into rvc-dev am: 918db9ec am: 9a2f55df" into rvc-d1-dev-plus-aosp