Merge "Update docs for ColorStateList to include alpha" into nyc-dev