70ff0c1144
This reverts commit 4dfcbec512.
Reason for revert: Fix the margin issue by handling the bottom
insets ourselves.
Change-Id: Ic01cadbbe847e419af8bb444ad57764e719152c3