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

Change-Id: I5583dde27c46f7130a540fce1476400767e7ec98