Merge branch 'bugfix/shorts-card-color' into release/5.2

# Conflicts:
#	1Weather/UI/View controllers/Today/Shorts/ShortsCollectionViewCell.swift
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Target Support Files/Pods-1Weather/Pods-1Weather.debug.xcconfig
#	Pods/Target Support Files/Pods-1Weather/Pods-1Weather.release.xcconfig