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

Change-Id: Ic91e2eecadc85e91de9bf3d4b6aba039272f5703