Merge "Updated dialog and toast assets Bug: 5076695"