Merge "Resolver - 'Always' button broken for non VIEW cases" into qt-dev am: 914de104b3
am: ef430bb118

Change-Id: Ib168d0e8fa6eb436a215b0a0a01119a81627c571