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

Change-Id: I477dcdfc276eaaa0b71242f7f56bc59b27142c60