Merge pull request #2389 from sigmabeta/lollipop-ui-tweaks Android: Add file browser screen to new UI, and several tweaks.
