Merge remote-tracking branch 'Upstream/develop' into Upstream_release
Merge branch 'Upstream_release' into Upstream_master
Added xxhdpi drawables (where available)
Merge pull request #342 from msal/master

Added xxhdpi drawables (where available)
Merge pull request #343 from chrislacy/master

Backport master to develop