Merge "Remove non-SDK API toast"