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

Change-Id: Idf2359b4b2e6ac23092053b2a969ec1ae416ae1c