'Rescan' item only available in the root of local library
Merge branch 'master' into ice-cream-sandwich