Merge branch 'release-2.0.3' into develop
Exception on some 4.4.2 devices with weird OEM services jar
Version bump to 2.0.4
Merge branch 'release-2.0.4'