Merge "Clear the staled mFocusedView when toast surface is closed." into tm-qpr-dev