Merge "Implement issue #3116702: New manifest tags for supported screen sizes  DO NOT MERGE" into gingerbread