Merge "Enable automatic FAB show/hide to work without minHeight" into nyc-dev