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

Change-Id: I27f8a61c638ab63f6b0960884e60b8bed35df812