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

Change-Id: Ief2a11d74ecc4aaeaaa1189a83e192426ba6e90f