Tighten up context menu items

* Reduce vertical padding on context menu items
* Add some vertical padding to the menu

Change-Id: Ie6546ae0bc04ae899bc16778daa9a0a58282e287
Merge "Tighten up context menu items"