Merge pull request #6084 from JosJuice/fab-placement Android: Adjust position of floating action button