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