Merge "Merge "Resolver - Fix bottom spacing issue with edge-to-edge" into qt-dev am: ea73bddd5b am: fef3b40787" into qt-r1-dev-plus-aosp