Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c
am: 54d49157fd

Change-Id: I11fc1d70568497d264cdf76a9fe3687baa62a9ea