Merge "Resolver - Fix bottom spacing issue with edge-to-edge" into qt-dev