TRUNK-2888 - Further improvements to the patient dashboard
(cherry picked from commit 115ade007088a95a49c459ac7a4644a83c9d480a)
Followup fix for: Retired states should not appear on the patient
dashboard - TRUNK-2888(cherry picked from commit e07f1a8caf18fe03699495f73712f2279afb448c)