Synced with support library v18, also fixed bottom glow