Cherry-picked 26df8
Cherry-pick edd6b; css cleanup