Merge "Resolver: Modernize layout" into qt-qpr1-dev
am: 15b780d108

Change-Id: I5aea7ba6f4f950d7857cc99d38a44ad329fb9088