Merge \\"Never disable DnD receiver to dislay condition correctly.\\" into nyc-mr1-dev am: 503a7514f6
am: e742057d06

Change-Id: I0129909dbc583875df8dd604eeb2181d7cddc708