Merge "Resolver - 'Always' button broken for non VIEW cases" into qt-dev