Added CONNECTED_TV, TABLET device type
Merge branch 'release-3.0.0' into release-3.2.0