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

Change-Id: Ibe159fb80f851be84cf825416ce936b481b38cf8