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

Change-Id: Ib68d80ac81a4d112d7bdf3ab7f7a65d45fc7861d