Merge branch 'release-2.0.5' into develop
Fix some 4.4.2 devices that have Am instead of mContext
Bump to 2.0.6
Merge branch 'release-2.0.6'