Merge "Enable variable size thumbnail for large screen" into sc-dev