Fix for the feature display trailer on tablet mode
Merge branch 'develop' into feature_display_trailerx
Merge branch 'feature_display_trailerx' into develop