#405 Move shuffle to by media controls, toggle to actionbar
#405 Remove shuffle options from everywhere except at album and top levels
Merge branch 'master' into Bookmarks