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

Change-Id: I0efc3076d9e42f28531fff2a9caf6eca3131687d