Merge "Improving accessibility feedback for two state widgets."