Merge "Added missing viewport meta tag to html resources"