Merge "ZenPreferences observe zen changes from USER_ALL"