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

Change-Id: I7d8a91bfbefb4d7a825beaba6d3288ee6e457771