#941: apply trigger fixing after app-upgrade

This closes #941.

It also fixes some incorrect user-ignored trigger behaviour (it used to prompt to always change user-ignored settings to enabled, regardless of whether they had any triggering).

@matthewrmshin, please review.