Merge "Revert "Don't re-prompt for VISUAL/AURAL after app upgrade"" into tm-dev