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

Change-Id: I4ea935b5807f13d6626c45ec5e74b23009520fb4