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

Change-Id: Iefa8e2707df45004a5ac37094ee93f1fac4721e9