Merge "Never disable DnD receiver to dislay condition correctly." into nyc-mr1-dev