Merge "Revert "Make subsettings display edge-to-edge"" into qt-dev am: 9a51ede665
am: 7db72f0ef1

Change-Id: Ie400dae74f651ba127a372d5109967f2256f509e