Merge "Update hidden API toast message"