Merge "Update toast appearance" into klp-dev